logstash-input-tcp 6.0.2-java → 6.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82b021e38562b73fd86db67622bf4e701c318877db99e2975c439bbbfcbc9f0
-  data.tar.gz: 45be9692924611030546fc05ef18046ffca0e4430fb6b5647cf5255948f89895
+  metadata.gz: 403704dc430009f35b036df09b638c613f345f33da52fbf750788b4e649760d6
+  data.tar.gz: c2443349ab82648037fcf4748cb4130f45e65bf3efadeec60db8e3124223c4e9
 SHA512:
-  metadata.gz: c2a1aac5ed786a53c841e440f9aab3d2132e1979284302d30bc1b16c206eb3716a940709e189d9b9fd276dcf6bda4661f4969822f1a5a8c089447819070dd46f
-  data.tar.gz: e3ffa0f369214f727bc3dc2202e5d8ff1eaf379a6c8aff2df0a652a616dae723c483a4042294a52d2c8f80412a1c62101ba3049dfcdde01fc54448d8809e7c1f
+  metadata.gz: 1e26da0f4abe68fbbcbb62d148bee467bdc71494462a608929850dbdda2c67f3bc87fd7ea68cab6306e41cca567f752940631a6f2276c467c437412438c99142
+  data.tar.gz: f54efa720d20246c05c84b63b5477707b7d16659c57d5e684138485b0908cd94ea4b14ce553d56d5eefc08ec6796e5f81548c41c025d4ff4a330f5aae59434a5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 6.0.3
+  - Skip empty lines while reading certificate files [#144](https://github.com/logstash-plugins/logstash-input-tcp/issues/144)
+
 ## 6.0.2
   - Fixed race condition where data would be accepted before queue was configured
 

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 @@
-6.0.2
+6.0.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.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/6.0.2/logstash-input-tcp-6.0.2.jar
+- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.3/logstash-input-tcp-6.0.3.jar
 - version
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses: