logstash-input-tcp 5.2.2-java → 5.2.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 147048d4bbe35f7c640da0c8cf9b54dc54bf15ebc3fe9141615c2168dbc0ab31
-  data.tar.gz: 53271ca6cf4aa13ae1621040c256aa0e78bb4455464e07073aece8212ab27f77
+  metadata.gz: 540a6f7d6ae06f0f03b71ad02d2872060706cd3ef398baf26538dd0e56dc23aa
+  data.tar.gz: c96eb4cbf80fe8df8c4115e2da5259770306352315de1354ad2a423d5e08bbe8
 SHA512:
-  metadata.gz: f391dcd37cc06060b0fe0ee7d2525b164f5036a3c959d8c8df9b05e294587ef396314206ca782b115708deebe4a398aa0dc57a4018240d6a7f95b887911665f3
-  data.tar.gz: 91d4f5a4861601a181a07e029ee9caea9f07c5dd8028e7128a6c9e8a8c0a7c9c0d7a76ac4f930176919c46f0f3e125049af6e82aaa190064284b455ec8270c7f
+  metadata.gz: 592a1308abe432552b0fef096ce40556c466ba6ac4d332fd677e299c9704e6c6edbfe255ca7c6dba0c55292e7155c39354d9a27b4317503346e0af7e1fd3f0b8
+  data.tar.gz: 2ca507f654bc2e236ce59805b7204265acc2492bc8fd8147759012a17d5ac903ce40fb3bcb6df98dc19552c74989176556e9c1e5c6ef69d0a9e66d80acf8cefc

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 5.2.6
+  - Ensure correct jar paths when building plugin from a non-standard directory
+
+## 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)
 

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/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
 

data/version

@@ -1 +1 @@
-5.2.2
+5.2.6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.6
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-09 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.2/logstash-input-tcp-5.2.2.jar
+- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/5.2.6/logstash-input-tcp-5.2.6.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