logstash-input-tcp 5.0.1-java → 5.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 742ec0ab317795f68e1bc001b74c7c893bfb61de
-  data.tar.gz: bff14817270bc44427e8dedc7eeccb55c8510565
+  metadata.gz: 194c2ce3a58504f3d3290cc5adc7945faffd3ff6
+  data.tar.gz: 46faee2a86e761688e5168709c986b3f295af60c
 SHA512:
-  metadata.gz: 7fe956bd95212a4530fb8a22fd328b4cb66f576e551127ffda60033f1a0539ae2751bc4d3c6b2038cc6e260b2d5e8118033963a133c7f9cd13e9740e24863321
-  data.tar.gz: d95be2441f2be3cfc063801ef10647fbd571b44c01b491c138fbc377f344e87b9efadb0d0f2e41fb496b3a52ba165478a56c0f7d7d0e6336049956977ea0bf0b
+  metadata.gz: bc017846852684f7cc36c933a5d4e58b9155a778a7d23589d06e6c44f08e6eafe1c7f80b70f750188a85633b69dfbbd3b11024e26c7b6b535dab24f5c51f6ee2
+  data.tar.gz: f90e391609b3f666aeba6f5ba9e283239b147728d3d15674cf31bb543a240260b47337cbca9aa46012d610fee6f975eb8f4ef505ceb0be2a5f7c704059b34c2d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.0.2
+  - Fix bug where this input would crash logstash during some socket reads when acting as an SSL server
+
 ## 5.0.1
   - Fix some documentation issues
 

data/lib/logstash/inputs/tcp.rb

@@ -189,6 +189,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
 
   private
 
+  RUN_LOOP_ERROR_MESSAGE="TCP input server encountered error"
   def run_ssl_server()
     while !stop?
       begin
@@ -199,9 +200,12 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
         # log error, close socket, accept next connection
         @logger.debug? && @logger.debug("SSL Error", :exception => e, :backtrace => e.backtrace)
       rescue => e
-        # if this exception occured while the plugin is stopping
-        # just ignore and exit
-        raise e unless stop?
+        @logger.error(
+          RUN_LOOP_ERROR_MESSAGE, 
+          :message => e.message,
+          :class => e.class.name,
+          :backtrace => e.backtrace
+        )
       end
     end
   ensure

data/spec/inputs/tcp_spec.rb

@@ -15,6 +15,20 @@ require_relative "../spec_helper"
 #Cabin::Channel.get(LogStash).level = :debug
 describe LogStash::Inputs::Tcp do
 
+  def get_port
+    begin
+      # Start high to better avoid common services
+      port = rand(10000..65535)
+      s = TCPServer.new("127.0.0.1", port)
+      s.close
+      return port
+    rescue Errno::EADDRINUSE
+      retry
+    end
+  end
+
+  let(:port) { get_port }
+
   context "codec (PR #1372)" do
     it "switches from plain to line" do
       require "logstash/codecs/plain"
@@ -36,7 +50,6 @@ describe LogStash::Inputs::Tcp do
 
   it "should read plain with unicode" do
     event_count = 10
-    port = rand(1024..65535)
     conf = <<-CONFIG
       input {
         tcp {
@@ -69,12 +82,11 @@ describe LogStash::Inputs::Tcp do
 
   it "should handle PROXY protocol v1 connections" do
     event_count = 10
-    port = rand(1024..65535)
     conf = <<-CONFIG
       input {
         tcp {
-          port => #{port}
           proxy_protocol => true
+          port => '#{port}'
         }
       }
     CONFIG
@@ -104,7 +116,6 @@ describe LogStash::Inputs::Tcp do
   end
 
   it "should read events with plain codec and ISO-8859-1 charset" do
-    port = rand(1024..65535)
     charset = "ISO-8859-1"
     conf = <<-CONFIG
       input {
@@ -132,7 +143,6 @@ describe LogStash::Inputs::Tcp do
   end
 
   it "should read events with json codec" do
-    port = rand(1024..65535)
     conf = <<-CONFIG
       input {
         tcp {
@@ -167,7 +177,6 @@ describe LogStash::Inputs::Tcp do
   end
 
   it "should read events with json codec (testing 'host' handling)" do
-    port = rand(1024..65535)
     conf = <<-CONFIG
       input {
         tcp {
@@ -194,7 +203,6 @@ describe LogStash::Inputs::Tcp do
   end
 
   it "should read events with json_lines codec" do
-    port = rand(1024..65535)
     conf = <<-CONFIG
       input {
         tcp {
@@ -233,7 +241,6 @@ describe LogStash::Inputs::Tcp do
 
   it "should one message per connection" do
     event_count = 10
-    port = rand(1024..65535)
     conf = <<-CONFIG
       input {
         tcp {
@@ -271,7 +278,6 @@ describe LogStash::Inputs::Tcp do
       srand(RSpec.configuration.seed)
     end
 
-    let(:port) { rand(1024..65535) }
     subject { LogStash::Plugin.lookup("input", "tcp").new({ "port" => port }) }
     let!(:helper) { TcpHelpers.new }
 
@@ -348,6 +354,41 @@ describe LogStash::Inputs::Tcp do
             end
           end
 
+          describe "an error occurs during an accept" do
+            let(:socket) { double("socket").as_null_object }
+
+            before do
+              allow(input).to receive(:server_socket).and_return(socket)
+
+              allow(socket).to receive(:accept) do |a1, a2, a3|
+                raise StandardError, "blah"
+              end
+            end
+
+            it "should log the error on accept" do
+              allow(input.logger).to receive(:error).with(any_args)
+              
+              stop = Thread.new {
+                sleep 2
+                input.do_stop
+              }
+              expect do
+                input.run(Queue.new)
+              end.not_to raise_error
+
+              expect(input.logger).to have_received(:error).with(
+                ::LogStash::Inputs::Tcp::RUN_LOOP_ERROR_MESSAGE,
+                :message => "blah",
+                :class => "StandardError",
+                :backtrace => anything
+              ).at_least(:once)
+
+              stop.join
+              # Wait for stop to actually happen
+              sleep 1
+            end
+          end
+
           context "that sends garbage instead of TLS handshake" do
             let!(:input_task) { Stud::Task.new { input.run(queue) } }
             let(:max_length) { 1000 }

data/version

@@ -1 +1 @@
-5.0.1
+5.0.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,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.0.1/logstash-input-tcp-5.0.1.jar
+- vendor/jar-dependencies/org/logstash/inputs/logstash-input-tcp/5.0.2/logstash-input-tcp-5.0.2.jar
 - version
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses: