logstash-input-tcp 5.0.4-java → 5.0.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df3e4929e62c379a3b9f904417a7cef6e0178284c292fc4d16630bee3b787703
-  data.tar.gz: d3575b78db9c0d8bbdc8fa7f777402831795680d7a76b1aa015f8d372cc94ea8
+  metadata.gz: ad7840c0cf73f327b2b02bf73482c901aac8574fc021e0595e11c2fd7f084dea
+  data.tar.gz: 3eb145d5dad58772c79d5ba7dc404efcc118681ffe5f0556366a02d5f5ec8ed0
 SHA512:
-  metadata.gz: 2649a80caeecea3f22603115e843d5e23dc44fe18c57c3cea09f82c497613476ffa322ce82c70b3ea122cfe63c805ab4e73985f85fd0ea5026c0eb79a9779c2e
-  data.tar.gz: 94d67190988a00efa762d6e76c09e730baa002adb009a93929322225904c06bd379af1372b1e5cae0ef653537da0d93a6c50f50b5487207dc4a9baf544fd92c8
+  metadata.gz: f53b94841621db869d25b9dbc96b4833f928bd7b7a2713347c6e56ef1e76d0dc8a35f41f6b7114c2d8a487a3ab11b510329f54b8a194fca4c8d003b1930f2637
+  data.tar.gz: ec3ab3f25406f52f1879621b1dae31ea667f7ea3fda2f7dfbf3b472bfb8876fd0d44f203918ffacbe6c09199c3b7282e6b5a331a287f310a3ed94c4b2302520e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.0.5
+  - Restore SSLSUBJECT field when ssl_verify is enabled. #115
+
 ## 5.0.4
   - Update Netty/tc-native versions to match those in beats input #113
 

data/lib/logstash/inputs/tcp.rb

@@ -178,19 +178,19 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   end
 
   def decode_buffer(client_ip_address, client_address, client_port, codec, proxy_address,
-                    proxy_port, tbuf)
+                    proxy_port, tbuf, socket)
     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_ip_address, client_address, client_port)
+      enqueue_decorated(event, client_ip_address, client_address, client_port, socket)
     end
   end
 
-  def flush_codec(codec, client_ip_address, client_address, client_port)
+  def flush_codec(codec, client_ip_address, client_address, client_port, socket)
     codec.flush do |event|
-      enqueue_decorated(event, client_ip_address, client_address, client_port)
+      enqueue_decorated(event, client_ip_address, client_address, client_port, socket)
     end
   end
 
@@ -268,7 +268,7 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
         end
       end
       decode_buffer(client_ip_address, client_address, client_port, codec, proxy_address,
-                    proxy_port, tbuf)
+                    proxy_port, tbuf, socket)
     end
   rescue EOFError
     @logger.debug? && @logger.debug("Connection closed", :client => peer)
@@ -284,13 +284,14 @@ class LogStash::Inputs::Tcp < LogStash::Inputs::Base
   ensure
     # catch all rescue nil on close to discard any close errors or invalid socket
     socket.close rescue nil
-    flush_codec(codec, client_ip_address, client_address, client_port)
+    flush_codec(codec, client_ip_address, client_address, client_port, socket)
   end
 
-  def enqueue_decorated(event, client_ip_address, client_address, client_port)
+  def enqueue_decorated(event, client_ip_address, client_address, client_port, socket)
     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)
+    event.set(SSLSUBJECT_FIELD, socket.peer_cert.subject.to_s) if socket && @ssl_enable && @ssl_verify && event.get(SSLSUBJECT_FIELD).nil?
     decorate(event)
     @output_queue << event
   end

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

@@ -22,7 +22,7 @@ class DecoderImpl
       tbuf = init_first_read(channel_addr, tbuf)
     end
     @tcp.decode_buffer(@ip_address, @address, @port, @codec,
-                       @proxy_address, @proxy_port, tbuf)
+                       @proxy_address, @proxy_port, tbuf, nil)
   end
 
   def copy
@@ -30,7 +30,7 @@ class DecoderImpl
   end
 
   def flush
-    @tcp.flush_codec(@codec, @ip_address, @address, @port)
+    @tcp.flush_codec(@codec, @ip_address, @address, @port, nil)
   end
 
   private

data/version

@@ -1 +1 @@
-5.0.4
+5.0.5

metadata

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