logstash-input-beats 6.0.7-java → 6.0.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a184d0b3635459c7b6159658ab2f0a609f976c246db5c312a9d6ee616a08d4de
-  data.tar.gz: 9cc9b010c94fb3b2fb12341594f3db716a8a1c27764ecfd751efae45be79b39d
+  metadata.gz: d36df63759f956947694a03bdb957713d14cbe14c52858176392f385928d4ec6
+  data.tar.gz: b3c002bbeb7213ee53ee1fb6a41c6655d4b8703f5fc655c9aade1904fe3faa03
 SHA512:
-  metadata.gz: aa5677e22ba9c902e7dce4f5b3c233cb70e79975b1f3d6b7873b80f445b9365234e04978bd2cca449ce85493ae1920f912a59f54b42991ddc7be3a586fdb3445
-  data.tar.gz: 4b3c0850ebc1b1a2555f496af88a765b9fa5470fbb4345d8ae558b50c56a5677482c2c3b387b36f2b554e3bd32aceeefda0fe7bc036304f68f35eec91d73938c
+  metadata.gz: 1078ff7c09d34c699208b470be1956bad26e36f608cfc48272a903fef44151043c3884cb8a1ce6a66244a5e4aa16fbc782e0e8c071f0e5137dc7cf9cf117d795
+  data.tar.gz: 22a92f568a487fd041366e77f7abc8a7d2ca0fa47a1ae3ef6cc43511d4f98de837c92c6f3bb64a5551ccef0d145108012fa47fc758bb1dd7eb036b1879fd8acb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.0.8
+ - Fixed issue where an SslContext was unnecessarily being created for each connection [#383](https://github.com/logstash-plugins/logstash-input-beats/pull/383)
+ - Fixed issue where `end` was not being called when an Inflater was closed [#383](https://github.com/logstash-plugins/logstash-input-beats/pull/383)
+
 ## 6.0.7
  - Reverted changes to netty and tcnative dependencies and removal of CBC ciphers to preserve compatibility with Lumberjack output [#381](https://github.com/logstash-plugins/logstash-input-beats/pull/381)
 

data/VERSION

@@ -1 +1 @@
-6.0.7
+6.0.8

data/lib/logstash-input-beats_jars.rb

@@ -9,4 +9,4 @@ require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.9.10')
 require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.9.10.1')
 require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.10')
 require_jar('org.apache.logging.log4j', 'log4j-api', '2.11.1')
-require_jar('org.logstash.beats', 'logstash-input-beats', '6.0.7')
+require_jar('org.logstash.beats', 'logstash-input-beats', '6.0.8')

data/lib/logstash/inputs/beats.rb

@@ -114,7 +114,7 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   config :tls_max_version, :validate => :number, :default => TLS.max.version
 
   # The list of ciphers suite to use, listed by priorities.
-  config :cipher_suites, :validate => :array, :default => org.logstash.netty.SslSimpleBuilder::DEFAULT_CIPHERS
+  config :cipher_suites, :validate => :array, :default => org.logstash.netty.SslContextBuilder::DEFAULT_CIPHERS
 
   # Close Idle clients after X seconds of inactivity.
   config :client_inactivity_timeout, :validate => :number, :default => 60
@@ -133,9 +133,9 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
     end
 
     java_import "org.logstash.beats.Server"
-    java_import "org.logstash.netty.SslSimpleBuilder"
+    java_import "org.logstash.netty.SslContextBuilder"
+    java_import "org.logstash.netty.SslHandlerProvider"
     java_import "java.io.FileInputStream"
-    java_import "io.netty.handler.ssl.OpenSsl"
 
     if !@ssl
       @logger.warn("Beats input: SSL Certificate will not be used") unless @ssl_certificate.nil?
@@ -167,25 +167,23 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
     if @ssl
 
       begin
-      ssl_builder = org.logstash.netty.SslSimpleBuilder.new(@ssl_certificate, @ssl_key, @ssl_key_passphrase.nil? ? nil : @ssl_key_passphrase.value)
-        .setProtocols(convert_protocols)
-        .setCipherSuites(normalized_ciphers)
+        ssl_context_builder = org.logstash.netty.SslContextBuilder.new(@ssl_certificate, @ssl_key, @ssl_key_passphrase.nil? ? nil : @ssl_key_passphrase.value)
+                          .setProtocols(convert_protocols)
+                          .setCipherSuites(normalized_ciphers)
       rescue java.lang.IllegalArgumentException => e
         raise LogStash::ConfigurationError, e
       end
 
-      ssl_builder.setHandshakeTimeoutMilliseconds(@ssl_handshake_timeout)
 
       if client_authentification?
         if @ssl_verify_mode.upcase == "FORCE_PEER"
-            ssl_builder.setVerifyMode(org.logstash.netty.SslSimpleBuilder::SslClientVerifyMode::FORCE_PEER)
+          ssl_context_builder.setVerifyMode(org.logstash.netty.SslContextBuilder::SslClientVerifyMode::FORCE_PEER)
         elsif @ssl_verify_mode.upcase == "PEER"
-            ssl_builder.setVerifyMode(org.logstash.netty.SslSimpleBuilder::SslClientVerifyMode::VERIFY_PEER)
+          ssl_context_builder.setVerifyMode(org.logstash.netty.SslContextBuilder::SslClientVerifyMode::VERIFY_PEER)
         end
-        ssl_builder.setCertificateAuthorities(@ssl_certificate_authorities)
+        ssl_context_builder.setCertificateAuthorities(@ssl_certificate_authorities)
       end
-
-      server.enableSSL(ssl_builder)
+      server.setSslHandlerProvider(org.logstash.netty.SslHandlerProvider.new(ssl_context_builder.build_context, @ssl_handshake_timeout))
     end
     server
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 6.0.7
+  version: 6.0.8
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -272,7 +272,7 @@ files:
 - vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/netty-tcnative-boringssl-static-2.0.12.Final.jar
 - vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar
 - vendor/jar-dependencies/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar
-- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.0.7/logstash-input-beats-6.0.7.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.0.8/logstash-input-beats-6.0.8.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)