logstash-input-tcp 5.2.1-java → 5.2.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ee7c79fca2dceea8688b100903ab8318ad2cd652740b0538c102504209bd1e0
-  data.tar.gz: fee6f5e7d1804c8ef60fd771a3d50caeeee289c9e517a93c2a33a5d207202bdb
+  metadata.gz: eeb327ea4a6ee534cbaf7844b90492296ed940792dd7801e753b8866d51287a1
+  data.tar.gz: 4d71e276661849f6730e7f765b9a4202f75dd3ebc5668011d9dc7bafdc4de9ab
 SHA512:
-  metadata.gz: 970218c4f6ed173209de6d40113423a49e356e1eeb3a8cf8603b5ddd7c51ae4766cadf73e78d917a17ba36b4d447fc1d9512ea12081dbd1cbb2e28e0f8ea9340
-  data.tar.gz: 0b4120780dcae5f582c118247a064025a57f998ddbe20ff5cb15d3c4ecbdef0a0a522cd6bd2968e77db75ff034d6810f4e13f8372f2de49ce08ea1cada19e573
+  metadata.gz: 5f7351ec1cdf22d72507349dc1d7c7c1b933b5ea28f66ab2c3cc2477123cddfe0af4b41f270e6a1bbba5a6703f444b4ead434bc056fa72e18b7119209e29db75
+  data.tar.gz: 8eb0a4174e5c5f9405627762dc76b8100a8b1b6cf42dc4767c488ebf6ca62121ab05b9bcc74b6fd92c539468ec59f79cb46a8a3f739db79c2fd81f24f6e01bc8

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 5.2.5
+  - Update Log4j dependency to 2.17
+
+## 5.2.4
+  - Update Log4j dependency to 2.16, ensuring this plugin's runtime relies only on log4j-api instead
+     of providing its own log4j-core [#189](https://github.com/logstash-plugins/logstash-input-tcp/pull/189)
+
+## 5.2.3
+  - Skip empty lines while reading certificate files [#144](https://github.com/logstash-plugins/logstash-input-tcp/issues/144)
+
+## 5.2.2
+  - Fixed race condition where data would be accepted before queue was configured [#142](https://github.com/logstash-plugins/logstash-input-tcp/pull/142)
+
 ## 5.2.1
   - Support multiple certificates per file [#140](https://github.com/logstash-plugins/logstash-input-tcp/pull/140)
   - Fixed support for encrypted pkcs8 private keys [#133](https://github.com/logstash-plugins/logstash-input-tcp/pull/133)

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

@@ -127,12 +127,19 @@ class SslOptions
 
   private
   def fetch_certificates_from_file(file, cf)
-    fis = FileInputStream.new(file)
+    fis = java.io.FileInputStream.new(file)
 
     while (fis.available > 0) do
-      yield cf.generateCertificate(fis)
+      cert = generate_certificate(cf, fis)
+      yield cert if cert
     end
   ensure
     fis.close if fis
   end
+
+  def generate_certificate(cf, fis)
+    cf.generateCertificate(fis)
+  rescue Java::JavaSecurityCert::CertificateException => e
+    raise e unless e.cause.message == "Empty input"
+  end
 end

data/lib/logstash/inputs/tcp.rb

@@ -141,11 +141,6 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   def register
     fix_streaming_codecs
 
-    # note that since we are opening a socket in register, we must also make sure we close it
-    # in the close method even if we also close it in the stop method since we could have
-    # a situation where register is called but not run & stop.
-
-    @logger.info("Starting tcp input listener", :address => "#{@host}:#{@port}", :ssl_enable => "#{@ssl_enable}")
     if server?
       ssl_context = get_ssl_context(SslOptions)
 
@@ -157,6 +152,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   def run(output_queue)
     @output_queue = output_queue
     if server?
+      @logger.info("Starting tcp input listener", :address => "#{@host}:#{@port}", :ssl_enable => "#{@ssl_enable}")
       @loop.run
     else
       run_client()

data/logstash-input-tcp.gemspec

@@ -31,7 +31,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logstash-codec-json_lines'
   s.add_runtime_dependency 'logstash-codec-multiline'
 
-  s.add_development_dependency 'logstash-devutils'
+  # 5.x branch of this plugin provides support for LS5&6.
+  # To use LS7+, you must use v6+ of this plugin.
+  s.add_runtime_dependency 'logstash-core', '< 7.0.0'
+
+  s.add_development_dependency 'logstash-devutils', '~> 1.0'
   s.add_development_dependency 'flores', '~> 0.0.6'
   s.add_development_dependency 'stud', '~> 0.0.22'
 end

data/spec/inputs/tcp_spec.rb

@@ -382,6 +382,35 @@ describe LogStash::Inputs::Tcp do
             ssc.delete
           end
         end
+
+        context "with multiple certificates with empty spaces in them" do
+          let(:ssc) { SelfSignedCertificate.new }
+          let(:certificate_file) { ssc.certificate }
+          let(:key_file) { ssc.private_key}
+          let(:ssc_2) { SelfSignedCertificate.new }
+          let(:certificate_file_2) { ssc.certificate }
+          let(:config) do
+            {
+              "host" => "127.0.0.1",
+              "port" => port,
+              "ssl_enable" => true,
+              "ssl_cert" => certificate_file.path,
+              "ssl_key" => key_file.path
+            }
+          end
+          before(:each) do
+            File.open(certificate_file.path, "a") do |file|
+              path = ssc_2.certificate.path
+              file.puts("\n")
+              file.puts(IO.read(path))
+              file.puts("\n")
+            end
+          end
+
+          it "should register without errors" do
+            expect { subject.register }.to_not raise_error
+          end
+        end
       end
     end
 
@@ -399,12 +428,7 @@ describe LogStash::Inputs::Tcp do
           chain_of_certificates = TcpHelpers.new.chain_of_certificates
 
           let(:tcp) do
-            begin
-              socket = TCPSocket.new("127.0.0.1", port)
-            rescue Errno::ECONNREFUSED
-              sleep 1
-              socket = TCPSocket.new("127.0.0.1", port)
-            end
+            Stud::try(5.times) { TCPSocket.new("127.0.0.1", port) }
           end
           let(:sslcontext) do
             sslcontext = OpenSSL::SSL::SSLContext.new
@@ -502,14 +526,8 @@ describe LogStash::Inputs::Tcp do
 
           context "that disconnects before doing TLS handshake" do
             before do
-              begin
-                client = TCPSocket.new("127.0.0.1", port)
-                client.close
-              rescue Errno::ECONNREFUSED
-                sleep 1
-                client = TCPSocket.new("127.0.0.1", port)
-                client.close
-              end
+              client = Stud::try(5.times) { TCPSocket.new("127.0.0.1", port) }
+              client.close
             end
 
             it "should not negatively impact the plugin" do
@@ -540,7 +558,7 @@ describe LogStash::Inputs::Tcp do
               # Assertion to verify this test is actually sending something.
               expect(garbage.length).to be > 0
 
-              client = TCPSocket.new("127.0.0.1", port)
+              client = Stud::try(5.times) { TCPSocket.new("127.0.0.1", port) }
               client.write(garbage)
               client.flush
               Thread.new { sleep(1); client.close }

data/version

@@ -1 +1 @@
-5.2.1
+5.2.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.5
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2021-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -103,17 +103,31 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.0
+  name: logstash-core
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   name: logstash-devutils
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -164,7 +178,7 @@ files:
 - logstash-input-tcp.gemspec
 - spec/inputs/tcp_spec.rb
 - spec/spec_helper.rb
-- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/5.2.1/logstash-input-tcp-5.2.1.jar
+- vendor/jar-dependencies/org/logstash/inputs/plugin/5.2.5/plugin-5.2.5.jar
 - version
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
@@ -188,8 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Reads events from a TCP socket