logstash-input-tcp 6.0.0-java → 6.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f95c4b965fd69c58c8ea30cebdfbd74838e07051b3491e9c88da3a6029b7bdf
-  data.tar.gz: a21e7f3a68395d29f40d083f77933191d702e553f14903d3062a163c0f550aa6
+  metadata.gz: b302df6e39b800aa93dc56ddeff90534f404c8e322a7d6ac5f359123e964dc3a
+  data.tar.gz: 77db42b004f85076fc336424b8fe30c10ac107c6e4a90ce68e7ffee63159651b
 SHA512:
-  metadata.gz: a928baf3ca1703fb850d09bc587299809b78b387b41c2a920f525d28d7ae335224b9d1f2dfa9f74ea91a88d1c45e4005c001bfe90fa5f6fa46ca476fe83ebc63
-  data.tar.gz: dd835f99eefdcdb04602beb68bb3c2f03a9fea58468f3c90dfb4461710740e9d0e56b992b9528ffc608872af4fc3d032286d4af7abd99d11b847483d4be657eb
+  metadata.gz: e531556d356c2037e23168faf0848b05ea4a7760e60a04be9a045a69d0cce07b5edb0ea7a84314bd47cad55f050bee5ffcf8e6d186c12796efce1db9cf86e112
+  data.tar.gz: 91b06eee36084aa9de3e7bfd71920d6e0c77085d26e2cc51df7abeec208f540e17c08c06a220b20efe0d6f7b4eaeed4426aee192f1c9d62ebad7d8d61deb00b0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 6.0.1
+  - Support multiple certificates per file [#140](https://github.com/logstash-plugins/logstash-input-tcp/pull/140)
+
 ## 6.0.0
   - Removed obsolete `data_timeout` and `ssl_cacert` options
 

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

@@ -76,7 +76,9 @@ class SslOptions
     # create certificate object
     cf = CertificateFactory.getInstance("X.509")
     cert_chain = []
-    cert_chain << cf.generateCertificate(FileInputStream.new(@ssl_cert_path))
+    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))
@@ -100,13 +102,19 @@ class SslOptions
       raise "Could not recognize 'ssl_key' format. Class: #{obj.class}"
     end
 
-    @ssl_extra_chain_certs.each do |cert|
-      cert_chain << cf.generateCertificate(FileInputStream.new(cert))
+    @ssl_extra_chain_certs.each do |file|
+      fetch_certificates_from_file(file, cf) do |cert|
+        cert_chain << cert
+      end
     end
     sslContextBuilder = SslContextBuilder.forServer(private_key, @ssl_key_passphrase, cert_chain.to_java(X509Certificate))
 
-    trust_certs = @ssl_certificate_authorities.map do |cert|
-      cf.generateCertificate(FileInputStream.new(cert))
+    trust_certs = []
+
+    @ssl_certificate_authorities.each do |file|
+      fetch_certificates_from_file(file, cf) do |cert|
+        trust_certs << cert
+      end
     end
 
     if trust_certs.any?
@@ -116,4 +124,15 @@ class SslOptions
     sslContextBuilder.clientAuth(@ssl_verify ? ClientAuth::REQUIRE : ClientAuth::NONE)
     sslContextBuilder.build()
   end
+
+  private
+  def fetch_certificates_from_file(file, cf)
+    fis = FileInputStream.new(file)
+
+    while (fis.available > 0) do
+      yield cf.generateCertificate(fis)
+    end
+  ensure
+    fis.close if fis
+  end
 end

data/version

@@ -1 +1 @@
-6.0.0
+6.0.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-03-08 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.0/logstash-input-tcp-6.0.0.jar
+- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/6.0.1/logstash-input-tcp-6.0.1.jar
 - version
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses: