logstash-input-tcp 3.0.6 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1caffd09fad0acdb3ab1bd24d98a522961ca925c
-  data.tar.gz: 7719d66218cdfa7431c44919db3bed9983328a64
+  metadata.gz: aa0f656c6f22603752ced42c300389f6cb23370e
+  data.tar.gz: 6dfceac238b13dd4d9eeaf00dbb2960aacf2f28b
 SHA512:
-  metadata.gz: a5cf8d7b1495f59ff810703828ab76ba450c0e9b74ca0b424dc3e579b6586c7abe431c15397e6c3d42d75bc53e6e9ea26747b665bc442d0ed940deb2ee60f078
-  data.tar.gz: 4268349cfb16117443a21389cd9feb4997088ae8d3ea7e541c1e966213ccc4798879d1869d203c48b9946acf7b942c882016d8bc390191135588811e898bfb1b
+  metadata.gz: 1a5d0e142600f59ff10a4c83f579bcede1cc8197f19ded98c12ed115ec9a13dc6dc3a4d9ac9f334bb82ca074d4acf5d52a7c6fdf3f9120207e7f5f4b5c768951
+  data.tar.gz: cfcbaf32298b674747fff0f2b3ce8a5abccc38ccb31c7cec3d358ee2946b7946ca03c58bcc47592a08e78f7e0a7b659270fec1d828de6b456145b9786a5ec82f

data/CHANGELOG.md

@@ -1,14 +1,14 @@
-## 3.0.6
- - Change the log level of the SSLError for the handshake from **error** to **debug** https://github.com/logstash-plugins/logstash-input-tcp/pull/53
+## 4.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
 # 3.0.5
  - Fixed a bug where using a certificate with a passphrase wouldn't work.
 # 3.0.4
- - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+  - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 # 3.0.3
- - New dependency requirements for logstash-core for the 5.0 release
+  - New dependency requirements for logstash-core for the 5.0 release
 ## 3.0.2
- - Fixed a bug where previous connection would accidentally be closed when accepting new socket connection
- - Fixed an issue with log message which used a closed socket's peer address 
+- Fixed a bug where previous connection would accidentally be closed when accepting new socket connection
+- Fixed an issue with log message which used a closed socket's peer address 
 
 ## 3.0.1
  - properly convert sslsubject to string before assigning to event field, added specs, see https://github.com/logstash-plugins/logstash-input-tcp/pull/38

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

data/lib/logstash/inputs/tcp.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+  # encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/util/socket_peer"
 
@@ -53,6 +53,10 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   # Useful when the CA chain is not necessary in the system store.
   config :ssl_extra_chain_certs, :validate => :array, :default => []
 
+  HOST_FIELD = "host".freeze
+  PORT_FIELD = "port".freeze
+  SSLSUBJECT_FIELD = "sslsubject".freeze
+
   def initialize(*args)
     super(*args)
 
@@ -114,7 +118,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
         server_connection_thread(output_queue, socket)
       rescue OpenSSL::SSL::SSLError => e
         # log error, close socket, accept next connection
-        @logger.debug? && @logger.debug("SSL Error", :exception => e, :backtrace => e.backtrace)
+        @logger.error("SSL Error", :exception => e, :backtrace => e.backtrace)
       rescue => e
         # if this exception occured while the plugin is stopping
         # just ignore and exit
@@ -151,9 +155,10 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
     peer = "#{client_address}:#{client_port}"
     while !stop?
       codec.decode(read(socket)) do |event|
-        event["host"] ||= client_address
-        event["port"] ||= client_port
-        event["sslsubject"] ||= socket.peer_cert.subject.to_s if @ssl_enable && @ssl_verify
+        event.set(HOST_FIELD, client_address) unless event.get(HOST_FIELD)
+        event.set(PORT_FIELD, client_port) unless event.get(PORT_FIELD)
+        event.set(SSLSUBJECT_FIELD, socket.peer_cert.subject.to_s) if @ssl_enable && @ssl_verify && event.get(SSLSUBJECT_FIELD).nil?
+
         decorate(event)
         output_queue << event
       end
@@ -174,9 +179,10 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
     socket.close rescue nil
 
     codec.respond_to?(:flush) && codec.flush do |event|
-      event["host"] ||= client_address
-      event["port"] ||= client_port
-      event["sslsubject"] ||= socket.peer_cert.subject.to_s if @ssl_enable && @ssl_verify
+      event.set(HOST_FIELD, client_address) unless event.get(HOST_FIELD)
+      event.set(PORT_FIELD, client_port) unless event.get(PORT_FIELD)
+      event.set(SSLSUBJECT_FIELD, socket.peer_cert.subject.to_s) if @ssl_enable && @ssl_verify && event.get(SSLSUBJECT_FIELD).nil?
+
       decorate(event)
       output_queue << event
     end

data/logstash-input-tcp.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-tcp'
-  s.version         = '3.0.6'
+  s.version         = '4.0.0'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = "Read events over a TCP socket."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -19,8 +19,11 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
 
+  # line vs streaming codecs required for fix_streaming_codecs
+  # TODO: fix_streaming_codecs should be refactored to not
+  # require the codecs to be installed.
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'logstash-codec-line'
   s.add_runtime_dependency 'logstash-codec-json'

data/spec/inputs/tcp_spec.rb

@@ -59,7 +59,7 @@ describe LogStash::Inputs::Tcp do
 
     insist { events.length } == event_count
     event_count.times do |i|
-      insist { events[i]["message"] } == "#{i} ☹"
+      insist { events[i].get("message") } == "#{i} ☹"
     end
   end
 
@@ -86,9 +86,9 @@ describe LogStash::Inputs::Tcp do
     end
 
     # Make sure the 0xA3 latin-1 code converts correctly to UTF-8.
-    insist { event["message"].size } == 1
-    insist { event["message"].bytesize } == 2
-    insist { event["message"] } == "£"
+    insist { event.get("message").size } == 1
+    insist { event.get("message").bytesize } == 2
+    insist { event.get("message") } == "£"
   end
 
   it "should read events with json codec" do
@@ -117,13 +117,13 @@ describe LogStash::Inputs::Tcp do
       queue.pop
     end
 
-    insist { event["hello"] } == data["hello"]
-    insist { event["foo"].to_a } == data["foo"] # to_a to cast Java ArrayList produced by JrJackson
-    insist { event["baz"] } == data["baz"]
+    insist { event.get("hello") } == data["hello"]
+    insist { event.get("foo").to_a } == data["foo"] # to_a to cast Java ArrayList produced by JrJackson
+    insist { event.get("baz") } == data["baz"]
 
     # Make sure the tcp input, w/ json codec, uses the event's 'host' value,
     # if present, instead of providing its own
-    insist { event["host"] } == data["host"]
+    insist { event.get("host") } == data["host"]
   end
 
   it "should read events with json codec (testing 'host' handling)" do
@@ -149,7 +149,7 @@ describe LogStash::Inputs::Tcp do
       queue.pop
     end
 
-    insist { event["hello"] } == data["hello"]
+    insist { event.get("hello") } == data["hello"]
     insist { event }.include?("host")
   end
 
@@ -184,10 +184,10 @@ describe LogStash::Inputs::Tcp do
     end
 
     events.each_with_index do |event, idx|
-      insist { event["hello"] } == data["hello"]
-      insist { event["foo"].to_a } == data["foo"] # to_a to cast Java ArrayList produced by JrJackson
-      insist { event["baz"] } == data["baz"]
-      insist { event["idx"] } == idx + 1
+      insist { event.get("hello") } == data["hello"]
+      insist { event.get("foo").to_a } == data["foo"] # to_a to cast Java ArrayList produced by JrJackson
+      insist { event.get("baz") } == data["baz"]
+      insist { event.get("idx") } == idx + 1
     end # do
   end # describe
 
@@ -211,11 +211,11 @@ describe LogStash::Inputs::Tcp do
       end
 
       # since each message is sent on its own tcp connection & thread, exact receiving order cannot be garanteed
-      event_count.times.collect{queue.pop}.sort_by{|event| event["message"]}
+      event_count.times.collect{queue.pop}.sort_by{|event| event.get("message")}
     end
 
     event_count.times do |i|
-      insist { events[i]["message"] } == "#{i}"
+      insist { events[i].get("message") } == "#{i}"
     end
   end
 
@@ -252,8 +252,8 @@ describe LogStash::Inputs::Tcp do
 
       context "when ssl_enable is true" do
         let(:pki) { Flores::PKI.generate }
-        let(:certificate) { pki[0] } 
-        let(:key) { pki[1] } 
+        let(:certificate) { pki[0] }
+        let(:key) { pki[1] }
         let(:certificate_file) { Stud::Temporary.file }
         let(:key_file) { Stud::Temporary.file }
         let(:queue) { Queue.new }

metadata

@@ -1,128 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-tcp
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  name: logstash-core-plugin-api
-  prerelease: false
+        version: '2.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-line
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-line
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json_lines
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json_lines
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: flores
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
-  name: flores
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
-  name: stud
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
-description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
+description: This gem is a Logstash plugin required to be installed on top of the
+  Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This
+  gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
@@ -144,7 +146,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -159,9 +161,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Read events over a TCP socket.
 test_files: