logstash-input-tcp 4.2.4-java → 5.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd8137c0bc8676f700dd52d89cc2ecf49391d125
-  data.tar.gz: ef85b4d90048f471d83fef39f126a81fc1529890
+  metadata.gz: 3a4539f2697990b50311f3566e906b0db7bf15b1
+  data.tar.gz: b9ce9daff9dae0c227c75ab146a1ab2f689212d8
 SHA512:
-  metadata.gz: 17c0e1922f32905b1513175e452ab377e46671b0ac1b7d2b089829f07fb1fdc0e9210c9f43fd80cf324e6b0a2eb3e89d1e91789e77b4ba1baf9d306eee3525da
-  data.tar.gz: 9248b2d5c5f4c209e22d432d306e55ee3ca374d7f2c439f1067c338814e13073be9328ed95c08b834064e229125b18ebd0a465c02098036b0395f7ff8aa11f1a
+  metadata.gz: 9048f5921f48a47c1dbd6194e5fa047a007d92d29cc9c8332ce4cb5ab9ae777cff0ec2e4aa34afa5a9e3ff1075efa05e27b3f50a465c6c9104cc99dcba7cbd23
+  data.tar.gz: e8465ea9a17e4fbd96c524fc5cb60992a834f57f1a30a9a242815baed2c1aad9ba89f74d085134d5346fb5a68a4c206d32db39c166d640ff67e4cc47f9bd5a72

data/CHANGELOG.md

@@ -1,8 +1,7 @@
-## 4.2.4
-  - Fix bug where this input would crash logstash during some socket reads when acting as an SSL server
-
-## 4.2.3
-  - Documentation changes
+## 5.0.0
+  - Changed the behaviour of the `host` field to contain the resolved peer hostname for a connection instead of its peer IP
+  - Mark deprecated :data_timeout and :ssl_cacert options as obsolete
+  and moved the peer's IP to the new field `ip_address`
 
 ## 4.2.2
   - Fixed regression causing incoming connection host ips being accidentally resolved to hostnames

data/docs/index.asciidoc

@@ -94,15 +94,6 @@ input plugins.
 
  
 
-[id="plugins-{type}s-{plugin}-data_timeout"]
-===== `data_timeout`  (DEPRECATED)
-
-  * DEPRECATED WARNING: This configuration item is deprecated and may not be available in future versions.
-  * Value type is <<number,number>>
-  * Default value is `-1`
-
-
-
 [id="plugins-{type}s-{plugin}-host"]
 ===== `host` 
 
@@ -140,15 +131,6 @@ When mode is `client`, the port to connect to.
 Proxy protocol support, only v1 is supported at this time
 http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
 
-[id="plugins-{type}s-{plugin}-ssl_cacert"]
-===== `ssl_cacert`  (DEPRECATED)
-
-  * DEPRECATED WARNING: This configuration item is deprecated and may not be available in future versions.
-  * Value type is <<path,path>>
-  * There is no default value for this setting.
-
-The SSL CA certificate, chainfile or CA path. The system CA path is automatically included.
-
 [id="plugins-{type}s-{plugin}-ssl_cert"]
 ===== `ssl_cert` 
 

data/lib/logstash/inputs/tcp.rb

@@ -73,7 +73,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   # When mode is `client`, the port to connect to.
   config :port, :validate => :number, :required => true
 
-  config :data_timeout, :validate => :number, :default => -1, :deprecated => "This setting is not used by this plugin. It will be removed soon."
+  config :data_timeout, :validate => :number, :obsolete => "This setting is not used any more."
 
   # Mode to operate in. `server` listens for client connections,
   # `client` connects to a server.
@@ -90,8 +90,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   # For input, sets the field `sslsubject` to that of the client certificate.
   config :ssl_verify, :validate => :boolean, :default => true
 
-  # The SSL CA certificate, chainfile or CA path. The system CA path is automatically included.
-  config :ssl_cacert, :validate => :path, :deprecated => "This setting is deprecated in favor of ssl_extra_chain_certs as it sets a more clear expectation to add more X509 certificates to the store"
+  config :ssl_cacert, :validate => :path, :obsolete => "This setting is obsolete. Use ssl_extra_chain_certs instead"
 
   # SSL certificate path
   config :ssl_cert, :validate => :path
@@ -107,6 +106,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   config :ssl_extra_chain_certs, :validate => :array, :default => []
 
   HOST_FIELD = "host".freeze
+  HOST_IP_FIELD = "[@metdata][ip_address]".freeze
   PORT_FIELD = "port".freeze
   PROXY_HOST_FIELD = "proxy_host".freeze
   PROXY_PORT_FIELD = "proxy_port".freeze
@@ -176,13 +176,14 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
     @loop.close rescue nil
   end
 
-  def decode_buffer(client_address, client_port, codec, proxy_address, proxy_port, tbuf)
+  def decode_buffer(client_ip_address, client_address, client_port, codec, proxy_address,
+                    proxy_port, tbuf)
     codec.decode(tbuf) do |event|
       if @proxy_protocol
         event.set(PROXY_HOST_FIELD, proxy_address) unless event.get(PROXY_HOST_FIELD)
         event.set(PROXY_PORT_FIELD, proxy_port) unless event.get(PROXY_PORT_FIELD)
       end
-      enqueue_decorated(event, client_address, client_port)
+      enqueue_decorated(event, client_ip_address, client_address, client_port)
     end
   end
 
@@ -231,6 +232,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
 
   def handle_socket(socket)
     client_address = socket.peeraddr[3]
+    client_ip_address = socket.peeraddr[2]
     client_port = socket.peeraddr[1]
     peer = "#{client_address}:#{client_port}"
     first_read = true
@@ -251,9 +253,11 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
           proxy_port = pp_info[5]
           client_address = pp_info[2]
           client_port = pp_info[4]
+          client_ip_address = ''
         end
       end
-      decode_buffer(client_address, client_port, codec, proxy_address, proxy_port, tbuf)
+      decode_buffer(client_ip_address, client_address, client_port, codec, proxy_address,
+                    proxy_port, tbuf)
     end
   rescue EOFError
     @logger.debug? && @logger.debug("Connection closed", :client => peer)
@@ -271,12 +275,13 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
     socket.close rescue nil
 
     codec.respond_to?(:flush) && codec.flush do |event|
-      enqueue_decorated(event, client_address, client_port)
+      enqueue_decorated(event, client_ip_address, client_address, client_port)
     end
   end
 
-  def enqueue_decorated(event, client_address, client_port)
+  def enqueue_decorated(event, client_ip_address, client_address, client_port)
     event.set(HOST_FIELD, client_address) unless event.get(HOST_FIELD)
+    event.set(HOST_IP_FIELD, client_ip_address) unless event.get(HOST_IP_FIELD)
     event.set(PORT_FIELD, client_port) unless event.get(PORT_FIELD)
     decorate(event)
     @output_queue << event
@@ -308,11 +313,6 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   def load_cert_store
     cert_store = OpenSSL::X509::Store.new
     cert_store.set_default_paths
-    if File.directory?(@ssl_cacert)
-      cert_store.add_path(@ssl_cacert)
-    else
-      cert_store.add_file(@ssl_cacert)
-    end if @ssl_cacert
     @ssl_extra_chain_certs.each do |cert|
       cert_store.add_file(cert)
     end

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

@@ -21,7 +21,7 @@ class DecoderImpl
     if @first_read
       tbuf = init_first_read(channel_addr, tbuf)
     end
-    @tcp.decode_buffer(@address, @port, @codec,
+    @tcp.decode_buffer(@ip_address, @address, @port, @codec,
                        @proxy_address, @proxy_port, tbuf)
   end
 
@@ -46,7 +46,8 @@ class DecoderImpl
       end
     else
       filtered = received
-      @address = channel_addr.get_address.get_host_address
+      @ip_address = channel_addr.get_address.get_host_address
+      @address = channel_addr.get_host_name
       @port = channel_addr.get_port
     end
     @first_read = false

data/spec/inputs/tcp_spec.rb

@@ -45,7 +45,7 @@ describe LogStash::Inputs::Tcp do
       }
     CONFIG
 
-    host = '127.0.0.1'
+    host = 'localhost'
     events = input(conf) do |pipeline, queue|
       socket = Stud::try(5.times) { TCPSocket.new(host, port) }
       event_count.times do |i|
@@ -63,6 +63,7 @@ describe LogStash::Inputs::Tcp do
       event = events[i]
       insist { event.get("message") } == "#{i} ☹"
       insist { event.get("host") } == host
+      insist { event.get("[@metdata][ip_address]") } == '127.0.0.1'
     end
   end
 

data/version

@@ -1 +1 @@
-4.2.4
+5.0.0

metadata

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