logstash-input-tcp 5.2.2-java → 5.2.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 147048d4bbe35f7c640da0c8cf9b54dc54bf15ebc3fe9141615c2168dbc0ab31
-  data.tar.gz: 53271ca6cf4aa13ae1621040c256aa0e78bb4455464e07073aece8212ab27f77
+  metadata.gz: 4e3fbae31c34a11ab25dfd0134c2851f7a84c4d186b32c2b282ac60116be031b
+  data.tar.gz: 9f72b2cbe4d3703719012bd897d70b92d9bf0e95a961240e7c73a7ee7235577a
 SHA512:
-  metadata.gz: f391dcd37cc06060b0fe0ee7d2525b164f5036a3c959d8c8df9b05e294587ef396314206ca782b115708deebe4a398aa0dc57a4018240d6a7f95b887911665f3
-  data.tar.gz: 91d4f5a4861601a181a07e029ee9caea9f07c5dd8028e7128a6c9e8a8c0a7c9c0d7a76ac4f930176919c46f0f3e125049af6e82aaa190064284b455ec8270c7f
+  metadata.gz: cabaaa5d5b41294f0a70dc62a63a1a820b20d7a2243f73532465da33ac975f7ae5c5168365652f94fb8dc897e10e2aebcb49816f61b1f7e7c4f0704b99b46abb
+  data.tar.gz: 84ce8e542f13d9945ae0c9d08506b8b512068026d4290246f6a1fde541b50423777870cdc2aea5dd97d469b3ee7123194efaaf6b0aa77d001de5b12ff95ab1a8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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/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.3

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.3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,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.3/logstash-input-tcp-5.2.3.jar
 - version
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses: