logstash-input-tcp 6.0.3-java → 6.0.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 403704dc430009f35b036df09b638c613f345f33da52fbf750788b4e649760d6
-  data.tar.gz: c2443349ab82648037fcf4748cb4130f45e65bf3efadeec60db8e3124223c4e9
+  metadata.gz: 574feed9b3754fbb15bad08e4d670e9771261f1f90cbe45731fd3fd58b30deec
+  data.tar.gz: 259fc46a2885620249b23bd3d927a0a9948fc71544a7ea775569098e005da9e0
 SHA512:
-  metadata.gz: 1e26da0f4abe68fbbcbb62d148bee467bdc71494462a608929850dbdda2c67f3bc87fd7ea68cab6306e41cca567f752940631a6f2276c467c437412438c99142
-  data.tar.gz: f54efa720d20246c05c84b63b5477707b7d16659c57d5e684138485b0908cd94ea4b14ce553d56d5eefc08ec6796e5f81548c41c025d4ff4a330f5aae59434a5
+  metadata.gz: 55d972be5de090da3e6142a54413064590495b2773b1c6bc21579e3e80ff644ba57b4a7a1083bf629fddd6e4ac85282ea74e5d9da4f05810b5cb45c50f176bfb
+  data.tar.gz: 662ca5182f7b4e4b6f40479c5a984eed7df2837c1853b1d42632270a239b162cfd490ec4d5079b59aa2cf1e6480bf3acf2e846fe268d8f3c836ea6d19daa66e5

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 6.0.8
+  - [DOC] better description for `tcp_keep_alive` option [#169](https://github.com/logstash-plugins/logstash-input-tcp/pull/169)
+
+## 6.0.7
+  - Fix: reduce error logging (to info level) on connection resets [#168](https://github.com/logstash-plugins/logstash-input-tcp/pull/168)
+  - Refactor: only patch Socket classes once (on first input)
+  - Refactor: use a proper log4j logger (in Java to avoid surprises when unwrapping `LogStash::Logging::Logger`)
+
+## 6.0.6
+  - Updated Netty dependencies. Additionally, this release removes the dependency on `tcnative` +
+    `boringssl`, using JVM supplied ciphers instead. This may result in fewer ciphers being available if the JCE
+    unlimited strength jurisdiction policy is not installed. (This policy is installed by default on versions of the
+    JDK from u161 onwards)[#157](https://github.com/logstash-plugins/logstash-input-tcp/pull/157)
+
+## 6.0.5
+  - 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)
+
+## 6.0.4
+  - Refactor: scope java_import to avoid polluting [#152](https://github.com/logstash-plugins/logstash-input-tcp/pull/152)
+
 ## 6.0.3
   - Skip empty lines while reading certificate files [#144](https://github.com/logstash-plugins/logstash-input-tcp/issues/144)
 
@@ -21,7 +41,7 @@
 
 ## 5.0.9
   - New configuration option to set TCP keep-alive [#16](https://github.com/logstash-plugins/logstash-input-tcp/pull/116)
-  
+
 ## 5.0.8
   - Reorder shut down of the two event loops to prevent RejectedExecutionException
 
@@ -57,7 +77,7 @@
 ## 4.2.2
   - Fixed regression causing incoming connection host ips being accidentally resolved to hostnames
   - Implemented plain socket server in a non-blocking way improving performance and fixing issues for use cases with a large number of concurrent connections
-  
+
 ## 4.2.1
   - Version yanked from RubyGems for accidental behaviour change causing unwanted reverse lookups on connections
 
@@ -87,7 +107,7 @@
  - New dependency requirements for logstash-core for the 5.0 release
 ## 3.0.2
  - Fixed a bug where previous connection would accidentally be closed when accepting new socket connection
- - Fixed an issue with log message which used a closed socket's peer address 
+ - Fixed an issue with log message which used a closed socket's peer address
 
 ## 3.0.1
  - properly convert sslsubject to string before assigning to event field, added specs, see https://github.com/logstash-plugins/logstash-input-tcp/pull/38

data/Gemfile

@@ -9,7 +9,3 @@ if Dir.exist?(logstash_path) && use_logstash_source
   gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
   gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
 end
-
-if RUBY_VERSION == "1.9.3"
-  gem 'rake', '12.2.1'
-end

data/LICENSE

@@ -1,13 +1,202 @@
-Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2020 Elastic and contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,6 +1,6 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-tcp.svg)](https://travis-ci.org/logstash-plugins/logstash-input-tcp)
+[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-input-tcp.svg)](https://travis-ci.com/logstash-plugins/logstash-input-tcp)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/docs/index.asciidoc

@@ -202,7 +202,9 @@ For input, sets the field `sslsubject` to that of the client certificate.
   * Value type is <<boolean,boolean>>
   * Default value is `false`
 
-Instruct the socket to use TCP keep alives. Uses OS defaults for keep alive settings.
+Instruct the socket to use TCP keep alive. If it's `true` then the underlying socket
+will use the OS defaults settings for keep alive. If it's `false` it doesn't configure any
+keep alive setting for the underlying socket.
 
 [id="plugins-{type}s-{plugin}-dns_reverse_lookup_enabled"]
 ===== `dns_reverse_lookup_enabled`

data/docs/testfile.asciidoc

@@ -0,0 +1,30 @@
+:plugin: tcp-test
+:type: input
+:default_codec: line
+
+///////////////////////////////////////////
+START - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+:version: %VERSION%
+:release_date: %RELEASE_DATE%
+:changelog_url: %CHANGELOG_URL%
+:include_path: ../../../../logstash/docs/include
+///////////////////////////////////////////
+END - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+
+[id="plugins-{type}s-{plugin}"]
+
+=== Tcp-test input plugin
+
+include::{include_path}/plugin_header.asciidoc[]
+
+==== Description
+
+This is only a test. 
+
+
+[id="plugins-{type}s-{plugin}-common-options"]
+include::{include_path}/{type}.asciidoc[]
+
+:default_codec!:

data/lib/logstash/inputs/tcp.rb

@@ -11,8 +11,6 @@ require "logstash/inputs/tcp/compat_ssl_options"
 require "socket"
 require "openssl"
 
-java_import org.logstash.tcp.InputLoop
-
 # Read events over a TCP socket.
 #
 # Like stdin and file inputs, each event is assumed to be one line of text.
@@ -23,7 +21,7 @@ java_import org.logstash.tcp.InputLoop
 # #### Accepting log4j2 logs
 #
 # Log4j2 can send JSON over a socket, and we can use that combined with our tcp
-# input to accept the logs. 
+# input to accept the logs.
 #
 # First, we need to configure your application to send logs in JSON over a
 # socket. The following log4j2.xml accomplishes this task.
@@ -62,6 +60,9 @@ java_import org.logstash.tcp.InputLoop
 #       }
 #     }
 class LogStash::Inputs::Tcp < LogStash::Inputs::Base
+
+  java_import org.logstash.tcp.InputLoop
+
   config_name "tcp"
 
   default :codec, "line"
@@ -118,12 +119,21 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   PROXY_PORT_FIELD = "proxy_port".freeze
   SSLSUBJECT_FIELD = "sslsubject".freeze
 
+  # Monkey patch TCPSocket and SSLSocket to include socket peer
+  # @private
+  def self.patch_socket_peer!
+    unless TCPSocket < ::LogStash::Util::SocketPeer
+      TCPSocket.send :include, ::LogStash::Util::SocketPeer
+    end
+    unless OpenSSL::SSL::SSLSocket < ::LogStash::Util::SocketPeer
+      OpenSSL::SSL::SSLSocket.send :include, ::LogStash::Util::SocketPeer
+    end
+  end
+
   def initialize(*args)
     super(*args)
 
-    # monkey patch TCPSocket and SSLSocket to include socket peer
-    TCPSocket.module_eval{include ::LogStash::Util::SocketPeer}
-    OpenSSL::SSL::SSLSocket.module_eval{include ::LogStash::Util::SocketPeer}
+    self.class.patch_socket_peer!
 
     # threadsafe socket bookkeeping
     @server_socket = nil
@@ -140,15 +150,15 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
     if server?
       ssl_context = get_ssl_context(SslOptions)
 
-      @loop = InputLoop.new(@host, @port, DecoderImpl.new(@codec, self), @tcp_keep_alive,
-                            ssl_context, @logger.to_java(org.apache.logging.log4j.Logger))
+
+      @loop = InputLoop.new(@host, @port, DecoderImpl.new(@codec, self), @tcp_keep_alive, ssl_context)
     end
   end
 
   def run(output_queue)
     @output_queue = output_queue
     if server?
-      @logger.info("Starting tcp input listener", :address => "#{@host}:#{@port}", :ssl_enable => "#{@ssl_enable}")
+      @logger.info("Starting tcp input listener", :address => "#{@host}:#{@port}", :ssl_enable => @ssl_enable)
       @loop.run
     else
       run_client()
@@ -241,12 +251,10 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   rescue Errno::ECONNRESET
     @logger.debug? && @logger.debug("Connection reset by peer", :client => peer)
   rescue OpenSSL::SSL::SSLError => e
-    # Fixes issue #23
-    @logger.error("SSL Error", :exception => e, :backtrace => e.backtrace)
-    socket.close rescue nil
+    @logger.error("SSL error", :client => peer, :message => e.message, :exception => e.class, :backtrace => e.backtrace)
   rescue => e
     # if plugin is stopping, don't bother logging it as an error
-    !stop? && @logger.error("An error occurred. Closing connection", :client => peer, :exception => e, :backtrace => e.backtrace)
+    !stop? && @logger.error("An error occurred, closing connection", :client => peer, :message => e.message, :exception => e.class, :backtrace => e.backtrace)
   ensure
     # catch all rescue nil on close to discard any close errors or invalid socket
     socket.close rescue nil
@@ -261,7 +269,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
     decorate(event)
     @output_queue << event
   end
-  
+
   def server?
     @mode == "server"
   end
@@ -282,7 +290,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
         @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
       end
     rescue => e
-      @logger.error("Could not inititalize SSL context", :exception => e, :backtrace => e.backtrace)
+      @logger.error("Could not inititalize SSL context", :message => e.message, :exception => e.class, :backtrace => e.backtrace)
       raise e
     end
 

data/lib/logstash/inputs/tcp/compat_ssl_options.rb

@@ -1,21 +1,5 @@
 require 'openssl'
-
-java_import 'io.netty.handler.ssl.ClientAuth'
-java_import 'io.netty.handler.ssl.SslContextBuilder'
-java_import 'java.io.FileInputStream'
-java_import 'java.io.FileReader'
-java_import 'java.security.cert.CertificateFactory'
-java_import 'java.security.cert.X509Certificate'
-java_import 'org.bouncycastle.asn1.pkcs.PrivateKeyInfo'
-java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
-java_import 'org.bouncycastle.openssl.PEMKeyPair'
-java_import 'org.bouncycastle.openssl.PEMParser'
-java_import 'org.bouncycastle.openssl.PEMEncryptedKeyPair'
-java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
-java_import 'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder'
-java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder'
-java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
-
+require "logstash/util/loggable"
 
 # Simulate a normal SslOptions builder:
 #
@@ -29,6 +13,22 @@ java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
 #       .set_ssl_certificate_authorities(@ssl_certificate_authorities.to_java(:string))
 #       .build.toSslContext()
 class SslOptions
+  include LogStash::Util::Loggable
+
+  java_import 'io.netty.handler.ssl.ClientAuth'
+  java_import 'io.netty.handler.ssl.SslContextBuilder'
+  java_import 'java.security.cert.X509Certificate'
+  java_import 'javax.crypto.Cipher'
+  java_import 'org.bouncycastle.asn1.pkcs.PrivateKeyInfo'
+  java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
+  java_import 'org.bouncycastle.openssl.PEMKeyPair'
+  java_import 'org.bouncycastle.openssl.PEMParser'
+  java_import 'org.bouncycastle.openssl.PEMEncryptedKeyPair'
+  java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
+  java_import 'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder'
+  java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder'
+  java_import 'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo'
+
   def self.builder
     new
   end
@@ -73,15 +73,17 @@ class SslOptions
   def toSslContext
     return nil unless @ssl_enabled
 
+    # Check key strength
+    logger.warn("JCE Unlimited Strength Jurisdiction Policy not installed - max key length is 128 bits") unless Cipher.getMaxAllowedKeyLength("AES") > 128
     # create certificate object
-    cf = CertificateFactory.getInstance("X.509")
+    cf = java.security.cert.CertificateFactory.getInstance("X.509")
     cert_chain = []
     fetch_certificates_from_file(@ssl_cert_path, cf) do |cert|
       cert_chain << cert
     end
 
     # convert key from pkcs1 to pkcs8 and get PrivateKey object
-    pem_parser = PEMParser.new(FileReader.new(@ssl_key_path))
+    pem_parser = PEMParser.new(java.io.FileReader.new(@ssl_key_path))
     java.security.Security.addProvider(BouncyCastleProvider.new)
     converter = JcaPEMKeyConverter.new
     case obj = pem_parser.readObject

data/lib/logstash/inputs/tcp/decoder_impl.rb

@@ -1,11 +1,9 @@
 # encoding: utf-8
 require 'java'
 
-java_import org.logstash.tcp.Decoder
-
 class DecoderImpl
 
-  include Decoder
+  include org.logstash.tcp.Decoder
 
   def initialize(codec, tcp)
     @tcp = tcp
@@ -40,8 +38,8 @@ class DecoderImpl
       pp_info = pp_hdr.split(/\s/)
       # PROXY proto clientip proxyip clientport proxyport
       if pp_info[0] != "PROXY"
-        @tcp.logger.error("invalid proxy protocol header label", :hdr => pp_hdr)
-        raise IOError
+        @tcp.logger.error("Invalid proxy protocol header label", :header => pp_hdr)
+        raise IOError.new("Invalid proxy protocol header label #{pp_hdr.inspect}")
       else
         @proxy_address = pp_info[3]
         @proxy_port = pp_info[5]

data/logstash-input-tcp.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logstash-codec-multiline'
 
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'insist'
   s.add_development_dependency 'flores', '~> 0.0.6'
   s.add_development_dependency 'stud', '~> 0.0.22'
 end

data/spec/inputs/tcp_spec.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
+require "insist"
+require "logstash/devutils/rspec/shared_examples"
 require "socket"
 require "timeout"
 require "logstash/json"
@@ -339,8 +341,7 @@ describe LogStash::Inputs::Tcp do
             "port" => port,
             "ssl_enable" => true,
             "ssl_cert" => certificate_file.path,
-            "ssl_key" => key_file.path,
-            "ssl_extra_chain_certs" => certificate_file.path
+            "ssl_key" => key_file.path
           }
         end
 
@@ -366,7 +367,6 @@ describe LogStash::Inputs::Tcp do
             File.unlink(certificate_file.path)
             File.unlink(key_file.path)
           end
-
         end
 
         context "with pkcs#8 keys" do

data/spec/spec_helper.rb

@@ -3,14 +3,17 @@ require "logstash/devutils/rspec/spec_helper"
 require "tempfile"
 require "stud/temporary"
 
-java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder'
-java_import 'org.bouncycastle.openssl.jcajce.JcaPEMWriter'
-java_import 'org.bouncycastle.openssl.jcajce.JcaPKCS8Generator'
-java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
 # this has been taken from the udp input, it should be DRYed
 
 class TcpHelpers
 
+  java_import 'org.bouncycastle.openssl.PEMParser'
+  java_import 'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder'
+  java_import 'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
+  java_import 'org.bouncycastle.openssl.jcajce.JcaPEMWriter'
+  java_import 'org.bouncycastle.openssl.jcajce.JcaPKCS8Generator'
+  java_import 'org.bouncycastle.jce.provider.BouncyCastleProvider'
+
   def self.pipelineless_input(plugin, size, &block)
     queue = Queue.new
     input_thread = Thread.new do

data/version

@@ -1 +1 @@
-6.0.3
+6.0.8

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.8
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: insist
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -157,6 +171,7 @@ files:
 - NOTICE.TXT
 - README.md
 - docs/index.asciidoc
+- docs/testfile.asciidoc
 - lib/logstash-input-tcp_jars.rb
 - lib/logstash/inputs/tcp.rb
 - lib/logstash/inputs/tcp/compat_ssl_options.rb
@@ -164,7 +179,7 @@ files:
 - logstash-input-tcp.gemspec
 - spec/inputs/tcp_spec.rb
 - spec/spec_helper.rb
-- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.3/logstash-input-tcp-6.0.3.jar
+- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.8/logstash-input-tcp-6.0.8.jar
 - version
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses: